Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

restore: Fix system tables are filtered bug (#1207) #1225

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1207

What problem does this PR solve?

Fix issue #1197 and #1201
When user only want to restore the system table, i.e. -f "mysql*.*", because the system database was rename to a temporary name, that name will be filtered causing no system table is restored

What is changed and how it works?

When filter restore databases and tables, revert the temporary name to its original name

Check List

Tests

  • Integration test

Code changes

  • Has exported function/method change

Related changes

  • Need to cherry-pick to the release branch

Release note

  • No Release Note

@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kennytm
Copy link
Collaborator

kennytm commented Jun 16, 2021

[2021-06-16T03:16:39.528Z] + run_sql 'SELECT count(*) from mysql.bar;'

[2021-06-16T03:16:39.528Z] + grep 11

[2021-06-16T03:16:39.528Z] ERROR 1146 (42S02) at line 1: Table 'mysql.bar' doesn't exist

🤔

@ZipFast ZipFast added this to the v4.0.14 milestone Jun 17, 2021
@ZipFast
Copy link
Contributor

ZipFast commented Jun 17, 2021

@kennytm
[2021-06-16T03:16:38.440Z] [2021/06/16 11:16:38.264 +08:00] [DEBUG] [systable_restore.go:46] ["system database filtered out"] [database=mysql]
It seems that the temporary system db is filtered out.

@ZipFast
Copy link
Contributor

ZipFast commented Jun 17, 2021

/run-all-tests

@ZipFast
Copy link
Contributor

ZipFast commented Jun 17, 2021

@YuJuncen

	if !f.MatchSchema(temporaryDB.O) {
		log.Debug("system database filtered out", zap.String("database", sysDB))
		return
	}

It seems the temporaryDB.O will be filtered out, and should be replaced with sysDB?

@ZipFast
Copy link
Contributor

ZipFast commented Jun 21, 2021

/run-all-tests

@ZipFast
Copy link
Contributor

ZipFast commented Jun 21, 2021

/build

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • kennytm

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 LGTM2 and removed status/LGT1 LGTM1 labels Jun 22, 2021
@3pointer
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 21d5737

@ti-chi-bot ti-chi-bot merged commit 29327f1 into pingcap:release-4.0 Jun 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants